From e6250e718a613baea83d2eeb8dc0d426ce4fdc9e Mon Sep 17 00:00:00 2001
From: Hristo Hristov <Hristo.Hristov@telerik.com>
Date: Tue, 28 Mar 2017 18:08:39 +0300
Subject: [PATCH] Disable recycling of native views createNativeView will set
 iOS nativeView if it is null/undefined

---
 tests/app/testRunner.ts                       |  5 +++-
 tests/app/ui/core/bindable/bindable-tests.ts  |  4 +--
 tests/app/ui/list-view/list-view-tests.ts     |  6 ++--
 tests/app/ui/repeater/repeater-tests.ts       |  2 +-
 .../application/application-common.ts         |  8 ++---
 .../application/application.android.ts        | 12 ++++----
 tns-core-modules/application/application.d.ts | 18 +++++-------
 .../application/application.ios.ts            | 18 +++++++-----
 .../ui/action-bar/action-bar.android.ts       |  4 ++-
 .../activity-indicator-common.ts              |  2 +-
 tns-core-modules/ui/border/border.ts          |  2 +-
 tns-core-modules/ui/button/button-common.ts   |  2 +-
 tns-core-modules/ui/button/button.android.ts  |  2 ++
 .../ui/content-view/content-view.ts           |  2 +-
 tns-core-modules/ui/core/bindable/bindable.ts |  7 +++--
 .../ui/core/view-base/view-base.ts            |  6 ++--
 .../ui/date-picker/date-picker-common.ts      |  2 +-
 .../ui/date-picker/date-picker.android.ts     |  2 ++
 .../editable-text-base.android.ts             |  1 +
 tns-core-modules/ui/frame/frame.android.ts    | 29 ++-----------------
 .../ui/html-view/html-view-common.ts          |  2 +-
 tns-core-modules/ui/image/image-common.ts     |  2 +-
 tns-core-modules/ui/image/image.android.ts    |  2 ++
 tns-core-modules/ui/label/label.android.ts    |  5 ++--
 tns-core-modules/ui/label/label.ios.ts        |  2 +-
 .../absolute-layout/absolute-layout-common.ts |  2 +-
 .../layouts/dock-layout/dock-layout-common.ts |  2 +-
 .../flexbox-layout/flexbox-layout-common.ts   |  2 +-
 .../flexbox-layout/flexbox-layout.android.ts  |  1 +
 .../layouts/grid-layout/grid-layout-common.ts |  2 +-
 .../grid-layout/grid-layout.android.ts        |  3 ++
 tns-core-modules/ui/layouts/layout.android.ts |  1 +
 .../stack-layout/stack-layout-common.ts       |  2 +-
 .../layouts/wrap-layout/wrap-layout-common.ts |  2 +-
 .../ui/list-picker/list-picker-common.ts      |  2 +-
 .../ui/list-picker/list-picker.android.ts     |  2 ++
 .../ui/list-view/list-view-common.ts          |  2 +-
 .../ui/list-view/list-view.android.ts         |  1 +
 tns-core-modules/ui/page/page.android.ts      |  1 +
 .../ui/progress/progress-common.ts            |  2 +-
 tns-core-modules/ui/repeater/repeater.ts      |  2 +-
 .../ui/scroll-view/scroll-view.android.ts     |  2 +-
 .../ui/scroll-view/scroll-view.ios.ts         |  2 +-
 .../ui/search-bar/search-bar-common.ts        |  2 +-
 .../ui/search-bar/search-bar.android.ts       |  2 ++
 .../ui/segmented-bar/segmented-bar-common.ts  |  2 +-
 .../ui/segmented-bar/segmented-bar.android.ts |  2 ++
 tns-core-modules/ui/slider/slider-common.ts   |  2 +-
 tns-core-modules/ui/slider/slider.android.ts  |  2 ++
 tns-core-modules/ui/switch/switch-common.ts   |  2 +-
 tns-core-modules/ui/switch/switch.android.ts  |  2 ++
 .../ui/tab-view/tab-view.android.ts           |  2 ++
 .../ui/text-base/text-base.android.ts         |  1 +
 .../ui/text-field/text-field-common.ts        |  2 +-
 .../ui/text-view/text-view.android.ts         |  2 +-
 .../ui/text-view/text-view.ios.ts             |  2 +-
 .../ui/time-picker/time-picker-common.ts      |  2 +-
 .../ui/time-picker/time-picker.android.ts     |  1 +
 .../ui/web-view/web-view.android.ts           |  1 +
 59 files changed, 112 insertions(+), 97 deletions(-)

diff --git a/tests/app/testRunner.ts b/tests/app/testRunner.ts
index 6f8167b1e..4988877e4 100644
--- a/tests/app/testRunner.ts
+++ b/tests/app/testRunner.ts
@@ -346,7 +346,10 @@ function printRunTestStats() {
     messageContainer.focus();
     page.style.fontSize = 11;
     if (page.android) {
-        setTimeout(() => messageContainer.dismissSoftInput());
+        setTimeout(() => {
+            messageContainer.dismissSoftInput();
+            (<android.view.View>messageContainer.nativeView).scrollTo(0, 0);
+        });
     }
 }
 
diff --git a/tests/app/ui/core/bindable/bindable-tests.ts b/tests/app/ui/core/bindable/bindable-tests.ts
index 7ebb0285e..560a6b4cd 100644
--- a/tests/app/ui/core/bindable/bindable-tests.ts
+++ b/tests/app/ui/core/bindable/bindable-tests.ts
@@ -604,7 +604,7 @@ export function test_BindingToDictionaryAtAppLevel() {
     pageViewModel.set("testProperty", testPropertyName);
     const dict = {};
     dict[testPropertyName] = expectedValue;
-    appModule.resources["dict"] = dict;
+    appModule.getResources()["dict"] = dict;
 
     const testFunc = function (views: Array<View>) {
         const testLabel = <Label>(views[0]);
@@ -629,7 +629,7 @@ export function test_BindingConverterCalledEvenWithNullValue() {
     const testPropertyValue = null;
     const expectedValue = "collapsed";
     pageViewModel.set("testProperty", testPropertyValue);
-    appModule.resources["converter"] = function (value) {
+    appModule.getResources()["converter"] = function (value) {
         if (value) {
             return "visible";
         } else {
diff --git a/tests/app/ui/list-view/list-view-tests.ts b/tests/app/ui/list-view/list-view-tests.ts
index 7313aeb45..c7ced8b61 100644
--- a/tests/app/ui/list-view/list-view-tests.ts
+++ b/tests/app/ui/list-view/list-view-tests.ts
@@ -421,7 +421,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
             return result;
         };
 
-        app.resources["dateConverter"] = dateConverter;
+        app.getResources()["dateConverter"] = dateConverter;
 
         var data = new observableArray.ObservableArray();
         data.push({ date: new Date(2020, 2, 7) });
@@ -542,7 +542,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
             return value;
         }
 
-        app.resources["testConverter"] = testConverter;
+        app.getResources()["testConverter"] = testConverter;
 
         var listViewModel = new observable.Observable();
         listViewModel.set("items", [1, 2, 3]);
@@ -570,7 +570,7 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
             return value;
         }
 
-        app.resources["testConverter"] = testConverter;
+        app.getResources()["testConverter"] = testConverter;
 
         var listViewModel = new observable.Observable();
         listViewModel.set("items", [1, 2, 3]);
diff --git a/tests/app/ui/repeater/repeater-tests.ts b/tests/app/ui/repeater/repeater-tests.ts
index c860fe89f..8f6098908 100644
--- a/tests/app/ui/repeater/repeater-tests.ts
+++ b/tests/app/ui/repeater/repeater-tests.ts
@@ -264,7 +264,7 @@ export function test_usingAppLevelConvertersInRepeaterItems() {
         return result;
     };
 
-    app.resources["dateConverter"] = dateConverter;
+    app.getResources()["dateConverter"] = dateConverter;
 
     var data = new observableArray.ObservableArray();
 
diff --git a/tns-core-modules/application/application-common.ts b/tns-core-modules/application/application-common.ts
index 327471909..7a79d34cc 100644
--- a/tns-core-modules/application/application-common.ts
+++ b/tns-core-modules/application/application-common.ts
@@ -18,7 +18,6 @@ export function hasLaunched(): boolean {
 export { Observable };
 
 import { UnhandledErrorEventData, iOSApplication, AndroidApplication, CssChangedEventData } from ".";
-import { NavigationEntry } from "../ui/frame";
 
 export const launchEvent = "launch";
 export const suspendEvent = "suspend";
@@ -30,10 +29,11 @@ export const orientationChangedEvent = "orientationChanged";
 
 let cssFile: string = "app.css";
 
-export let mainModule: string;
-export let mainEntry: NavigationEntry;
+let resources: any = {};
 
-export let resources: any = {};
+export function getResources() {
+    return resources;
+}
 
 export function setResources(res: any) {
     resources = res;
diff --git a/tns-core-modules/application/application.android.ts b/tns-core-modules/application/application.android.ts
index f2e0ad5f1..a6d463a04 100644
--- a/tns-core-modules/application/application.android.ts
+++ b/tns-core-modules/application/application.android.ts
@@ -107,21 +107,23 @@ const androidApp = new AndroidApplication();
 exports.android = androidApp;
 setApplication(androidApp);
 
+let mainEntry: NavigationEntry;
 let started = false;
-export function start(entry?: NavigationEntry) {
+export function start(entry?: NavigationEntry | string) {
     if (started) {
         throw new Error("Application is already started.");
     }
 
+    started = true;
+    mainEntry = typeof entry === "string" ? { moduleName: entry } : entry;
     if (!androidApp.nativeApp) {
         const nativeApp = getNativeApplication();
         androidApp.init(nativeApp);
     }
+}
 
-    started = true;
-    if (entry) {
-        exports.mainEntry = entry;
-    }
+export function getMainEntry() {
+    return mainEntry;
 }
 
 export function getNativeApplication(): android.app.Application {
diff --git a/tns-core-modules/application/application.d.ts b/tns-core-modules/application/application.d.ts
index 5ab584264..1c89b11d1 100644
--- a/tns-core-modules/application/application.d.ts
+++ b/tns-core-modules/application/application.d.ts
@@ -103,23 +103,19 @@ export interface CssChangedEventData extends EventData {
 }
 
 /**
- * The main page path (without the file extension) for the application starting from the application root. 
- * For example if you have page called "main.js" in a folder called "subFolder" and your root folder is "app" you can specify mainModule like this:
- * var application = require("application");
- * application.mainModule = "app/subFolder/main";
- * application.start();
+ * Get main entry specified when calling start function.
  */
-export var mainModule: string;
+export function getMainEntry(): NavigationEntry;
 
 /**
- * The main navigation entry to be used when loading the main Page.
+ * Get application level static resources.
  */
-export var mainEntry: NavigationEntry;
+export function getResources(): any;
 
 /**
- * An application level static resources.
+ * Set application level static resources.
  */
-export var resources: any;
+export function setResources(res: any): void;
 
 /**
  * Sets application level static resources.
@@ -156,7 +152,7 @@ export function off(eventNames: string, callback?: any, thisArg?: any);
 /**
  * Call this method to start the application. Important: All code after this method call will not be executed!
  */
-export function start(entry?: NavigationEntry);
+export function start(entry?: NavigationEntry | string);
 
 /**
  * A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
diff --git a/tns-core-modules/application/application.ios.ts b/tns-core-modules/application/application.ios.ts
index 8d2dc3f96..eb8924945 100644
--- a/tns-core-modules/application/application.ios.ts
+++ b/tns-core-modules/application/application.ios.ts
@@ -188,13 +188,14 @@ const iosApp = new IOSApplication();
 exports.ios = iosApp;
 setApplication(iosApp);
 
+let mainEntry: NavigationEntry;
 function createRootView(v?: View) {
     let rootView = v;
     let frame: Frame;
     let main: string | NavigationEntry;
     if (!rootView) {
-        // try to navigate to the mainEntry/Module (if specified)
-        main = exports.mainEntry || exports.mainModule;
+        // try to navigate to the mainEntry (if specified)
+        main = mainEntry;
         if (main) {
             frame = new Frame();
             frame.navigate(main);
@@ -209,12 +210,13 @@ function createRootView(v?: View) {
     return rootView;
 }
 
+export function getMainEntry() {
+    return mainEntry;
+}
+
 let started: boolean = false;
-exports.start = function (entry?: NavigationEntry) {
-    if (entry) {
-        exports.mainEntry = entry;
-    }
-    
+export function start(entry?: string | NavigationEntry) {
+    mainEntry = typeof entry === "string" ? { moduleName: entry } : entry;
     started = true;
 
     if (!iosApp.nativeApp) {
@@ -246,4 +248,4 @@ global.__onLiveSync = function () {
     }
 
     livesync();
-}
+}
\ No newline at end of file
diff --git a/tns-core-modules/ui/action-bar/action-bar.android.ts b/tns-core-modules/ui/action-bar/action-bar.android.ts
index 9150a8f0e..bb1a55ea4 100644
--- a/tns-core-modules/ui/action-bar/action-bar.android.ts
+++ b/tns-core-modules/ui/action-bar/action-bar.android.ts
@@ -137,11 +137,13 @@ export class ActionBar extends ActionBarBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         (<any>this.nativeView).menuItemClickListener.owner = this;
     }
 
     public disposeNativeView() {
         (<any>this.nativeView).menuItemClickListener.owner = null;
+        super.disposeNativeView();
     }
 
     public onLoaded() {
@@ -365,7 +367,7 @@ export class ActionBar extends ActionBarBase {
     }
 }
 
-ActionBar.prototype.recycleNativeView = true;
+// ActionBar.prototype.recycleNativeView = true;
 
 let defaultTitleTextColor: number;
 
diff --git a/tns-core-modules/ui/activity-indicator/activity-indicator-common.ts b/tns-core-modules/ui/activity-indicator/activity-indicator-common.ts
index e974983eb..5b9410bfa 100644
--- a/tns-core-modules/ui/activity-indicator/activity-indicator-common.ts
+++ b/tns-core-modules/ui/activity-indicator/activity-indicator-common.ts
@@ -7,7 +7,7 @@ export class ActivityIndicatorBase extends View implements ActivityIndicatorDefi
     public busy: boolean;
 }
 
-ActivityIndicatorBase.prototype.recycleNativeView = true;
+// ActivityIndicatorBase.prototype.recycleNativeView = true;
 
 export const busyProperty = new Property<ActivityIndicatorBase, boolean>({ name: "busy", defaultValue: false, valueConverter: booleanConverter });
 busyProperty.register(ActivityIndicatorBase);
diff --git a/tns-core-modules/ui/border/border.ts b/tns-core-modules/ui/border/border.ts
index 7fd9feac5..5a45088a6 100644
--- a/tns-core-modules/ui/border/border.ts
+++ b/tns-core-modules/ui/border/border.ts
@@ -41,4 +41,4 @@ export class Border extends ContentView implements BorderDefinition {
     }
 }
 
-Border.prototype.recycleNativeView = true;
\ No newline at end of file
+// Border.prototype.recycleNativeView = true;
\ No newline at end of file
diff --git a/tns-core-modules/ui/button/button-common.ts b/tns-core-modules/ui/button/button-common.ts
index b65b28cd0..c201fe597 100644
--- a/tns-core-modules/ui/button/button-common.ts
+++ b/tns-core-modules/ui/button/button-common.ts
@@ -14,4 +14,4 @@ export abstract class ButtonBase extends TextBase implements ButtonDefinition {
     }
 }
 
-ButtonBase.prototype.recycleNativeView = true;
\ No newline at end of file
+// ButtonBase.prototype.recycleNativeView = true;
\ No newline at end of file
diff --git a/tns-core-modules/ui/button/button.android.ts b/tns-core-modules/ui/button/button.android.ts
index d41c03844..1d6c0e448 100644
--- a/tns-core-modules/ui/button/button.android.ts
+++ b/tns-core-modules/ui/button/button.android.ts
@@ -52,10 +52,12 @@ export class Button extends ButtonBase {
 
     public initNativeView(): void {
         (<any>this.nativeView).clickListener.owner = this;
+        super.initNativeView();
     }
 
     public disposeNativeView() {
         (<any>this.nativeView).clickListener.owner = null;
+        super.disposeNativeView();
     }
 
     @PseudoClassHandler("normal", "highlighted", "pressed", "active")
diff --git a/tns-core-modules/ui/content-view/content-view.ts b/tns-core-modules/ui/content-view/content-view.ts
index fe9a74480..629bbc0db 100644
--- a/tns-core-modules/ui/content-view/content-view.ts
+++ b/tns-core-modules/ui/content-view/content-view.ts
@@ -92,4 +92,4 @@ export class ContentView extends CustomLayoutView implements ContentViewDefiniti
     }
 }
 
-ContentView.prototype.recycleNativeView = true;
\ No newline at end of file
+// ContentView.prototype.recycleNativeView = true;
\ No newline at end of file
diff --git a/tns-core-modules/ui/core/bindable/bindable.ts b/tns-core-modules/ui/core/bindable/bindable.ts
index 3c5e0dfce..857d9387f 100644
--- a/tns-core-modules/ui/core/bindable/bindable.ts
+++ b/tns-core-modules/ui/core/bindable/bindable.ts
@@ -348,9 +348,10 @@ export class Binding {
                 let context = this.source && this.source.get && this.source.get() || global;
                 let model = {};
                 let addedProps = [];
-                for (let prop in application.resources) {
-                    if (application.resources.hasOwnProperty(prop) && !context.hasOwnProperty(prop)) {
-                        context[prop] = application.resources[prop];
+                const resources = application.getResources();
+                for (let prop in resources) {
+                    if (resources.hasOwnProperty(prop) && !context.hasOwnProperty(prop)) {
+                        context[prop] = resources[prop];
                         addedProps.push(prop);
                     }
                 }
diff --git a/tns-core-modules/ui/core/view-base/view-base.ts b/tns-core-modules/ui/core/view-base/view-base.ts
index d32b7afc4..ed2c13e2a 100644
--- a/tns-core-modules/ui/core/view-base/view-base.ts
+++ b/tns-core-modules/ui/core/view-base/view-base.ts
@@ -659,8 +659,10 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
             }
         } else {
             // TODO: Implement _createNativeView for iOS
-            this.createNativeView();
-            // this.nativeView = this._iosView = (<any>this)._nativeView;
+            const nativeView = this.createNativeView();
+            if (!currentNativeView && nativeView) {
+                this.nativeView = this._iosView = nativeView;
+            }
         }
 
         this.initNativeView();
diff --git a/tns-core-modules/ui/date-picker/date-picker-common.ts b/tns-core-modules/ui/date-picker/date-picker-common.ts
index 81382e20d..276fdc836 100644
--- a/tns-core-modules/ui/date-picker/date-picker-common.ts
+++ b/tns-core-modules/ui/date-picker/date-picker-common.ts
@@ -12,7 +12,7 @@ export class DatePickerBase extends View implements DatePickerDefinition {
     public date: Date;
 }
 
-DatePickerBase.prototype.recycleNativeView = true;
+// DatePickerBase.prototype.recycleNativeView = true;
 
 export const yearProperty = new Property<DatePickerBase, number>({ name: "year", valueConverter: (v) => parseInt(v) });
 yearProperty.register(DatePickerBase);
diff --git a/tns-core-modules/ui/date-picker/date-picker.android.ts b/tns-core-modules/ui/date-picker/date-picker.android.ts
index 14fc80fbf..4417374ce 100644
--- a/tns-core-modules/ui/date-picker/date-picker.android.ts
+++ b/tns-core-modules/ui/date-picker/date-picker.android.ts
@@ -64,11 +64,13 @@ export class DatePicker extends DatePickerBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         (<any>this.nativeView).listener.owner = this;
     }
 
     public disposeNativeView() {
         (<any>this.nativeView).listener.owner = null;
+        super.disposeNativeView();
     }
 
     private updateNativeDate(): void {
diff --git a/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts b/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts
index 2e31dd01d..4c0a62d24 100644
--- a/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts
+++ b/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts
@@ -150,6 +150,7 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         const nativeView = this.nativeView;
         (<any>nativeView).listener.owner = this;
         this._keyListenerCache = nativeView.getKeyListener();
diff --git a/tns-core-modules/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts
index 5191f7008..db42771a0 100644
--- a/tns-core-modules/ui/frame/frame.android.ts
+++ b/tns-core-modules/ui/frame/frame.android.ts
@@ -290,12 +290,6 @@ export class Frame extends FrameBase {
     }
 
     public createNativeView() {
-        // TODO: probably memory leak.
-        // this._listener = new android.view.View.OnAttachStateChangeListener({
-        //     onViewAttachedToWindow: this.onNativeViewAttachedToWindow.bind(this),
-        //     onViewDetachedFromWindow: this.onNativeViewDetachedToWindow.bind(this)
-        // });
-
         const root = new org.nativescript.widgets.ContentLayout(this._context);
         if (this._containerViewId < 0) {
             this._containerViewId = android.view.View.generateViewId();
@@ -304,31 +298,17 @@ export class Frame extends FrameBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         this._android.rootViewGroup = this.nativeView;
         this._android.rootViewGroup.setId(this._containerViewId);
-        // this._android.rootViewGroup.addOnAttachStateChangeListener(this._listener);
     }
 
-    // public resetNativeView() {
-    //     this._android.rootViewGroup.removeOnAttachStateChangeListener(this._listener);
-    // }
-
     public disposeNativeView() {
         // we should keep the reference to underlying native object, since frame can contain many pages.
         this._android.rootViewGroup = null;
+        super.disposeNativeView();
     }
 
-    // private onNativeViewAttachedToWindow(view: android.view.View): void {
-    //     if (this._delayedNavigationEntry) {
-    //         this._navigateCore(this._delayedNavigationEntry);
-    //         this._delayedNavigationEntry = undefined;
-    //     }
-    // }
-
-    // private onNativeViewDetachedToWindow(view: android.view.View): void {
-    //     // unused for the moment.
-    // }
-
     public _popFromFrameStack() {
         if (!this._isInFrameStack) {
             return;
@@ -795,10 +775,7 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
         }
 
         if (!rootView) {
-            navParam = application.mainEntry;
-            if (!navParam) {
-                navParam = application.mainModule;
-            }
+            navParam = application.getMainEntry();
 
             if (navParam) {
                 frame = new Frame();
diff --git a/tns-core-modules/ui/html-view/html-view-common.ts b/tns-core-modules/ui/html-view/html-view-common.ts
index 5f1b9ae20..4919fbfe4 100644
--- a/tns-core-modules/ui/html-view/html-view-common.ts
+++ b/tns-core-modules/ui/html-view/html-view-common.ts
@@ -7,7 +7,7 @@ export class HtmlViewBase extends View implements HtmlViewDefinition {
     public html: string;
 }
 
-HtmlViewBase.prototype.recycleNativeView = true;
+// HtmlViewBase.prototype.recycleNativeView = true;
 
 // TODO: Can we use Label.ios optimization for affectsLayout???
 export const htmlProperty = new Property<HtmlViewBase, string>({ name: "html", defaultValue: "", affectsLayout: true });
diff --git a/tns-core-modules/ui/image/image-common.ts b/tns-core-modules/ui/image/image-common.ts
index c88295e1c..440107a67 100644
--- a/tns-core-modules/ui/image/image-common.ts
+++ b/tns-core-modules/ui/image/image-common.ts
@@ -103,7 +103,7 @@ export abstract class ImageBase extends View implements ImageDefinition {
     }
 }
 
-ImageBase.prototype.recycleNativeView = true;
+// ImageBase.prototype.recycleNativeView = true;
 
 export const imageSourceProperty = new Property<ImageBase, ImageSource>({ name: "imageSource" });
 imageSourceProperty.register(ImageBase);
diff --git a/tns-core-modules/ui/image/image.android.ts b/tns-core-modules/ui/image/image.android.ts
index 708c80c8b..61dd30f95 100644
--- a/tns-core-modules/ui/image/image.android.ts
+++ b/tns-core-modules/ui/image/image.android.ts
@@ -97,11 +97,13 @@ export class Image extends ImageBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         (<any>this.nativeView).listener.owner = this;
     }
 
     public disposeNativeView() {
         (<any>this.nativeView).listener.owner = null;
+        super.disposeNativeView();
     }
 
     public _createImageSourceFromSrc() {
diff --git a/tns-core-modules/ui/label/label.android.ts b/tns-core-modules/ui/label/label.android.ts
index 9c9edc9e7..ee6118420 100644
--- a/tns-core-modules/ui/label/label.android.ts
+++ b/tns-core-modules/ui/label/label.android.ts
@@ -21,10 +21,11 @@ export class Label extends TextBase implements LabelDefinition {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         const textView = this.nativeView;
         textView.setSingleLine(true);
-        // textView.setEllipsize(android.text.TextUtils.TruncateAt.END);
+        textView.setEllipsize(android.text.TextUtils.TruncateAt.END);
     }
 }
 
-Label.prototype.recycleNativeView = true;
\ No newline at end of file
+// Label.prototype.recycleNativeView = true;
\ No newline at end of file
diff --git a/tns-core-modules/ui/label/label.ios.ts b/tns-core-modules/ui/label/label.ios.ts
index 30eaf2a22..3f86c871e 100644
--- a/tns-core-modules/ui/label/label.ios.ts
+++ b/tns-core-modules/ui/label/label.ios.ts
@@ -234,4 +234,4 @@ export class Label extends TextBase implements LabelDefinition {
     }
 }
 
-Label.prototype.recycleNativeView = true;
\ No newline at end of file
+// Label.prototype.recycleNativeView = true;
\ No newline at end of file
diff --git a/tns-core-modules/ui/layouts/absolute-layout/absolute-layout-common.ts b/tns-core-modules/ui/layouts/absolute-layout/absolute-layout-common.ts
index aad2dc96c..ed398dc1e 100644
--- a/tns-core-modules/ui/layouts/absolute-layout/absolute-layout-common.ts
+++ b/tns-core-modules/ui/layouts/absolute-layout/absolute-layout-common.ts
@@ -43,7 +43,7 @@ export class AbsoluteLayoutBase extends LayoutBase implements AbsoluteLayoutDefi
     }
 }
 
-AbsoluteLayoutBase.prototype.recycleNativeView = true;
+// AbsoluteLayoutBase.prototype.recycleNativeView = true;
 
 export const leftProperty = new Property<View, Length>({
     name: "left", defaultValue: zeroLength,
diff --git a/tns-core-modules/ui/layouts/dock-layout/dock-layout-common.ts b/tns-core-modules/ui/layouts/dock-layout/dock-layout-common.ts
index d90ce6c30..d7d6da506 100644
--- a/tns-core-modules/ui/layouts/dock-layout/dock-layout-common.ts
+++ b/tns-core-modules/ui/layouts/dock-layout/dock-layout-common.ts
@@ -27,7 +27,7 @@ export class DockLayoutBase extends LayoutBase implements DockLayoutDefinition {
     }
 }
 
-DockLayoutBase.prototype.recycleNativeView = true;
+// DockLayoutBase.prototype.recycleNativeView = true;
 
 export const dockProperty = new Property<View, "left" | "top" | "right" | "bottom">({
     name: "dock", defaultValue: "left", valueChanged: (target, oldValue, newValue) => {
diff --git a/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout-common.ts b/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout-common.ts
index f912d7aab..b16dba0b4 100644
--- a/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout-common.ts
+++ b/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout-common.ts
@@ -209,7 +209,7 @@ export abstract class FlexboxLayoutBase extends LayoutBase {
     }
 }
 
-FlexboxLayoutBase.prototype.recycleNativeView = true;
+// FlexboxLayoutBase.prototype.recycleNativeView = true;
 
 export const flexDirectionProperty = new CssProperty<Style, FlexDirection>({ name: "flexDirection", cssName: "flex-direction", defaultValue: FlexDirection.ROW, affectsLayout: isIOS, valueConverter: FlexDirection.parse });
 flexDirectionProperty.register(Style);
diff --git a/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.android.ts b/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.android.ts
index b34d986a5..787bdcc51 100644
--- a/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.android.ts
+++ b/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.android.ts
@@ -85,6 +85,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
 
     public disposeNativeView() {
         (<any>this.nativeView).invalidateOrdersCache();
+        super.disposeNativeView();
     }
 
     [flexDirectionProperty.getDefault](): FlexDirection {
diff --git a/tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts b/tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
index ce22a9726..ba5ade497 100644
--- a/tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
+++ b/tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
@@ -305,7 +305,7 @@ export class GridLayoutBase extends LayoutBase implements GridLayoutDefinition {
     }
 }
 
-GridLayoutBase.prototype.recycleNativeView = true;
+// GridLayoutBase.prototype.recycleNativeView = true;
 
 export const columnProperty = new Property<View, number>({
     name: "col", defaultValue: 0,
diff --git a/tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts b/tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts
index c72d04db3..dcee4f122 100644
--- a/tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts
+++ b/tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts
@@ -57,6 +57,7 @@ export class GridLayout extends GridLayoutBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         // Update native GridLayout
         this.rowsInternal.forEach((itemSpec: ItemSpec, index, rows) => { this._onRowAdded(itemSpec); }, this);
         this.columnsInternal.forEach((itemSpec: ItemSpec, index, rows) => { this._onColumnAdded(itemSpec); }, this);
@@ -73,6 +74,8 @@ export class GridLayout extends GridLayoutBase {
             const itemSpec = <ItemSpec>this.columnsInternal[i];
             this._onColumnRemoved(itemSpec, i);
         }
+
+        super.disposeNativeView();
     }
 
     public _onRowAdded(itemSpec: ItemSpec) {
diff --git a/tns-core-modules/ui/layouts/layout.android.ts b/tns-core-modules/ui/layouts/layout.android.ts
index 4c449905b..a31c9b3ca 100644
--- a/tns-core-modules/ui/layouts/layout.android.ts
+++ b/tns-core-modules/ui/layouts/layout.android.ts
@@ -47,6 +47,7 @@ export class Layout extends LayoutBase implements LayoutDefinition {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         (<any>this.nativeView)[OWNER] = this;
     }
 
diff --git a/tns-core-modules/ui/layouts/stack-layout/stack-layout-common.ts b/tns-core-modules/ui/layouts/stack-layout/stack-layout-common.ts
index 8cdd6e9bb..79b6fc4bd 100644
--- a/tns-core-modules/ui/layouts/stack-layout/stack-layout-common.ts
+++ b/tns-core-modules/ui/layouts/stack-layout/stack-layout-common.ts
@@ -7,7 +7,7 @@ export class StackLayoutBase extends LayoutBase implements StackLayoutDefinition
     public orientation: "horizontal" | "vertical";
 }
 
-StackLayoutBase.prototype.recycleNativeView = true;
+// StackLayoutBase.prototype.recycleNativeView = true;
 
 export const orientationProperty = new Property<StackLayoutBase, "horizontal" | "vertical">({
     name: "orientation", defaultValue: "vertical", affectsLayout: isIOS,
diff --git a/tns-core-modules/ui/layouts/wrap-layout/wrap-layout-common.ts b/tns-core-modules/ui/layouts/wrap-layout/wrap-layout-common.ts
index c052c29a3..37acdb6ae 100644
--- a/tns-core-modules/ui/layouts/wrap-layout/wrap-layout-common.ts
+++ b/tns-core-modules/ui/layouts/wrap-layout/wrap-layout-common.ts
@@ -11,7 +11,7 @@ export class WrapLayoutBase extends LayoutBase implements WrapLayoutDefinition {
     public effectiveItemHeight: number;
 }
 
-WrapLayoutBase.prototype.recycleNativeView = true;
+// WrapLayoutBase.prototype.recycleNativeView = true;
 
 export const itemWidthProperty = new Property<WrapLayoutBase, Length>({
     name: "itemWidth", defaultValue: "auto", affectsLayout: isIOS, valueConverter: (v) => Length.parse(v),
diff --git a/tns-core-modules/ui/list-picker/list-picker-common.ts b/tns-core-modules/ui/list-picker/list-picker-common.ts
index 0bec40935..06cb89799 100644
--- a/tns-core-modules/ui/list-picker/list-picker-common.ts
+++ b/tns-core-modules/ui/list-picker/list-picker-common.ts
@@ -20,7 +20,7 @@ export class ListPickerBase extends View implements ListPickerDefinition {
     }
 }
 
-ListPickerBase.prototype.recycleNativeView = true;
+// ListPickerBase.prototype.recycleNativeView = true;
 
 export const selectedIndexProperty = new CoercibleProperty<ListPickerBase, number>({
     name: "selectedIndex", defaultValue: -1,
diff --git a/tns-core-modules/ui/list-picker/list-picker.android.ts b/tns-core-modules/ui/list-picker/list-picker.android.ts
index 3db53e575..41b1ab499 100644
--- a/tns-core-modules/ui/list-picker/list-picker.android.ts
+++ b/tns-core-modules/ui/list-picker/list-picker.android.ts
@@ -99,6 +99,7 @@ export class ListPicker extends ListPickerBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         const nativeView = this.nativeView;
         this._selectorWheelPaint = getSelectorWheelPaint(nativeView);
         (<any>nativeView).formatter.owner = this;
@@ -119,6 +120,7 @@ export class ListPicker extends ListPickerBase {
         const nativeView = this.nativeView;
         (<any>nativeView).formatter.owner = null;
         (<any>nativeView).valueChangedListener.owner = null;
+        super.disposeNativeView();
     }
 
     private _fixNumberPickerRendering() {
diff --git a/tns-core-modules/ui/list-view/list-view-common.ts b/tns-core-modules/ui/list-view/list-view-common.ts
index 7256f63bb..0f886b4f0 100644
--- a/tns-core-modules/ui/list-view/list-view-common.ts
+++ b/tns-core-modules/ui/list-view/list-view-common.ts
@@ -124,7 +124,7 @@ export abstract class ListViewBase extends View implements ListViewDefinition {
     }
 }
 
-ListViewBase.prototype.recycleNativeView = true;
+// ListViewBase.prototype.recycleNativeView = true;
 
 /**
  * Represents the property backing the items property of each ListView instance.
diff --git a/tns-core-modules/ui/list-view/list-view.android.ts b/tns-core-modules/ui/list-view/list-view.android.ts
index 31a9d6627..1cf00023b 100644
--- a/tns-core-modules/ui/list-view/list-view.android.ts
+++ b/tns-core-modules/ui/list-view/list-view.android.ts
@@ -74,6 +74,7 @@ export class ListView extends ListViewBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         const nativeView: any = this.nativeView;
         (<any>nativeView).itemClickListener.owner = this;
         const adapter = (<any>nativeView).adapter;
diff --git a/tns-core-modules/ui/page/page.android.ts b/tns-core-modules/ui/page/page.android.ts
index a790f1ef5..d57b2a4ad 100644
--- a/tns-core-modules/ui/page/page.android.ts
+++ b/tns-core-modules/ui/page/page.android.ts
@@ -99,6 +99,7 @@ export class Page extends PageBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         this.nativeView.setBackgroundColor(-1); // White color.
     }
 
diff --git a/tns-core-modules/ui/progress/progress-common.ts b/tns-core-modules/ui/progress/progress-common.ts
index 2d7627f20..0b668010b 100644
--- a/tns-core-modules/ui/progress/progress-common.ts
+++ b/tns-core-modules/ui/progress/progress-common.ts
@@ -27,7 +27,7 @@ export class ProgressBase extends View implements ProgressDefinition {
     // }
 }
 
-ProgressBase.prototype.recycleNativeView = true;
+// ProgressBase.prototype.recycleNativeView = true;
 
 /**
  * Represents the observable property backing the value property of each Progress instance.
diff --git a/tns-core-modules/ui/repeater/repeater.ts b/tns-core-modules/ui/repeater/repeater.ts
index 3a6b0a68c..a04fd5ec4 100644
--- a/tns-core-modules/ui/repeater/repeater.ts
+++ b/tns-core-modules/ui/repeater/repeater.ts
@@ -118,7 +118,7 @@ export class Repeater extends CustomLayoutView implements RepeaterDefinition {
 
 }
 
-Repeater.prototype.recycleNativeView = true;
+// Repeater.prototype.recycleNativeView = true;
 
 /**
  * Represents the item template property of each ListView instance.
diff --git a/tns-core-modules/ui/scroll-view/scroll-view.android.ts b/tns-core-modules/ui/scroll-view/scroll-view.android.ts
index a5ec3fdcc..e3d925b9e 100644
--- a/tns-core-modules/ui/scroll-view/scroll-view.android.ts
+++ b/tns-core-modules/ui/scroll-view/scroll-view.android.ts
@@ -132,4 +132,4 @@ export class ScrollView extends ScrollViewBase {
     }
 }
 
-ScrollView.prototype.recycleNativeView = false;
\ No newline at end of file
+// ScrollView.prototype.recycleNativeView = false;
\ No newline at end of file
diff --git a/tns-core-modules/ui/scroll-view/scroll-view.ios.ts b/tns-core-modules/ui/scroll-view/scroll-view.ios.ts
index 17b376d15..d8b349071 100644
--- a/tns-core-modules/ui/scroll-view/scroll-view.ios.ts
+++ b/tns-core-modules/ui/scroll-view/scroll-view.ios.ts
@@ -150,4 +150,4 @@ export class ScrollView extends ScrollViewBase {
     }
 }
 
-ScrollView.prototype.recycleNativeView = true;
\ No newline at end of file
+// ScrollView.prototype.recycleNativeView = true;
\ No newline at end of file
diff --git a/tns-core-modules/ui/search-bar/search-bar-common.ts b/tns-core-modules/ui/search-bar/search-bar-common.ts
index 0e25abf37..29333bfcd 100644
--- a/tns-core-modules/ui/search-bar/search-bar-common.ts
+++ b/tns-core-modules/ui/search-bar/search-bar-common.ts
@@ -14,7 +14,7 @@ export abstract class SearchBarBase extends View implements SearchBarDefinition
     public abstract dismissSoftInput();
 }
 
-SearchBarBase.prototype.recycleNativeView = true;
+// SearchBarBase.prototype.recycleNativeView = true;
 
 export const textProperty = new Property<SearchBarBase, string>({ name: "text", defaultValue: "", affectsLayout: isIOS });
 textProperty.register(SearchBarBase);
diff --git a/tns-core-modules/ui/search-bar/search-bar.android.ts b/tns-core-modules/ui/search-bar/search-bar.android.ts
index 384c06d60..39a86c175 100644
--- a/tns-core-modules/ui/search-bar/search-bar.android.ts
+++ b/tns-core-modules/ui/search-bar/search-bar.android.ts
@@ -108,6 +108,7 @@ export class SearchBar extends SearchBarBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         const nativeView: any = this.nativeView;
         nativeView.closeListener.owner = this;
         nativeView.queryTextListener.owner = this;
@@ -117,6 +118,7 @@ export class SearchBar extends SearchBarBase {
         const nativeView: any = this.nativeView;
         nativeView.closeListener.owner = null;
         nativeView.queryTextListener.owner = null;
+        super.disposeNativeView();
     }
 
     [backgroundColorProperty.getDefault](): number {
diff --git a/tns-core-modules/ui/segmented-bar/segmented-bar-common.ts b/tns-core-modules/ui/segmented-bar/segmented-bar-common.ts
index 0ad0ac11c..472bbf67a 100644
--- a/tns-core-modules/ui/segmented-bar/segmented-bar-common.ts
+++ b/tns-core-modules/ui/segmented-bar/segmented-bar-common.ts
@@ -84,7 +84,7 @@ export abstract class SegmentedBarBase extends View implements SegmentedBarDefin
     }
 }
 
-SegmentedBarBase.prototype.recycleNativeView = true;
+// SegmentedBarBase.prototype.recycleNativeView = true;
 
 /**
  * Gets or sets the selected index dependency property of the SegmentedBar.
diff --git a/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts b/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
index fcfeec235..ad61f947a 100644
--- a/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
+++ b/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
@@ -211,6 +211,7 @@ export class SegmentedBar extends SegmentedBarBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         const nativeView: any = this.nativeView;
         nativeView.listener.owner = this;
         this._tabContentFactory = this._tabContentFactory || new TabContentFactory(this);
@@ -219,6 +220,7 @@ export class SegmentedBar extends SegmentedBarBase {
     public disposeNativeView() {
         const nativeView: any = this.nativeView;
         nativeView.listener.owner = null;
+        super.disposeNativeView();
     }
 
     private insertTab(tabItem: SegmentedBarItem, index: number): void {
diff --git a/tns-core-modules/ui/slider/slider-common.ts b/tns-core-modules/ui/slider/slider-common.ts
index ce5617be5..93ffeddc3 100644
--- a/tns-core-modules/ui/slider/slider-common.ts
+++ b/tns-core-modules/ui/slider/slider-common.ts
@@ -10,7 +10,7 @@ export class SliderBase extends View implements SliderDefinition {
     public maxValue: number;
 }
 
-SliderBase.prototype.recycleNativeView = true;
+// SliderBase.prototype.recycleNativeView = true;
 
 /**
  * Represents the observable property backing the value property of each Slider instance.
diff --git a/tns-core-modules/ui/slider/slider.android.ts b/tns-core-modules/ui/slider/slider.android.ts
index f1ee137d8..fb5b793ac 100644
--- a/tns-core-modules/ui/slider/slider.android.ts
+++ b/tns-core-modules/ui/slider/slider.android.ts
@@ -58,6 +58,7 @@ export class Slider extends SliderBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         const nativeView: any = this.nativeView;
         nativeView.listener.owner = this;
     }
@@ -65,6 +66,7 @@ export class Slider extends SliderBase {
     public disposeNativeView() {
         const nativeView: any = this.nativeView;
         nativeView.listener.owner = null;
+        super.disposeNativeView();
     }
 
     /**
diff --git a/tns-core-modules/ui/switch/switch-common.ts b/tns-core-modules/ui/switch/switch-common.ts
index 7044b660b..3f4cb5501 100644
--- a/tns-core-modules/ui/switch/switch-common.ts
+++ b/tns-core-modules/ui/switch/switch-common.ts
@@ -7,7 +7,7 @@ export class SwitchBase extends View implements SwitchDefinition {
     public checked: boolean;
 }
 
-SwitchBase.prototype.recycleNativeView = true;
+// SwitchBase.prototype.recycleNativeView = true;
 
 export const checkedProperty = new Property<SwitchBase, boolean>({ name: "checked", defaultValue: false, valueConverter: booleanConverter });
 checkedProperty.register(SwitchBase);
\ No newline at end of file
diff --git a/tns-core-modules/ui/switch/switch.android.ts b/tns-core-modules/ui/switch/switch.android.ts
index 8401f3f52..d470e1818 100644
--- a/tns-core-modules/ui/switch/switch.android.ts
+++ b/tns-core-modules/ui/switch/switch.android.ts
@@ -45,6 +45,7 @@ export class Switch extends SwitchBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         const nativeView: any = this.nativeView;
         nativeView.listener.owner = this;
     }
@@ -52,6 +53,7 @@ export class Switch extends SwitchBase {
     public disposeNativeView() {
         const nativeView: any = this.nativeView;
         nativeView.listener.owner = null;
+        super.disposeNativeView();
     }
 
     [checkedProperty.getDefault](): boolean {
diff --git a/tns-core-modules/ui/tab-view/tab-view.android.ts b/tns-core-modules/ui/tab-view/tab-view.android.ts
index 8afadca7c..9ccd8e675 100644
--- a/tns-core-modules/ui/tab-view/tab-view.android.ts
+++ b/tns-core-modules/ui/tab-view/tab-view.android.ts
@@ -309,6 +309,7 @@ export class TabView extends TabViewBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         if (this._androidViewId < 0) {
             this._androidViewId = android.view.View.generateViewId();
         }
@@ -335,6 +336,7 @@ export class TabView extends TabViewBase {
         this._tabLayout = null;
         (<any>this._viewPager).listener.owner = null;
         this._viewPager = null;
+        super.disposeNativeView();
     }
 
     private setAdapter(items: Array<TabViewItem>) {
diff --git a/tns-core-modules/ui/text-base/text-base.android.ts b/tns-core-modules/ui/text-base/text-base.android.ts
index 9d4968bcb..b8f4e93fc 100644
--- a/tns-core-modules/ui/text-base/text-base.android.ts
+++ b/tns-core-modules/ui/text-base/text-base.android.ts
@@ -60,6 +60,7 @@ export class TextBase extends TextBaseCommon {
         super.resetNativeView();
         // We reset it here too because this could be changed by multiple properties - whiteSpace, secure, textTransform
         this.nativeView.setTransformationMethod(this._defaultTransformationMethod);
+        this._defaultTransformationMethod = null;
     }
 
     [textProperty.getDefault](): string {
diff --git a/tns-core-modules/ui/text-field/text-field-common.ts b/tns-core-modules/ui/text-field/text-field-common.ts
index 6366b738e..23b45b183 100644
--- a/tns-core-modules/ui/text-field/text-field-common.ts
+++ b/tns-core-modules/ui/text-field/text-field-common.ts
@@ -8,7 +8,7 @@ export class TextFieldBase extends EditableTextBase implements TextFieldDefiniti
     public secure: boolean;
 }
 
-TextFieldBase.prototype.recycleNativeView = true;
+// TextFieldBase.prototype.recycleNativeView = true;
 
 export const secureProperty = new Property<TextFieldBase, boolean>({ name: "secure", defaultValue: false, valueConverter: booleanConverter });
 secureProperty.register(TextFieldBase);
\ No newline at end of file
diff --git a/tns-core-modules/ui/text-view/text-view.android.ts b/tns-core-modules/ui/text-view/text-view.android.ts
index 9e12a6222..94c993860 100644
--- a/tns-core-modules/ui/text-view/text-view.android.ts
+++ b/tns-core-modules/ui/text-view/text-view.android.ts
@@ -16,4 +16,4 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
     }
 }
 
-TextView.prototype.recycleNativeView = true;
\ No newline at end of file
+// TextView.prototype.recycleNativeView = true;
\ No newline at end of file
diff --git a/tns-core-modules/ui/text-view/text-view.ios.ts b/tns-core-modules/ui/text-view/text-view.ios.ts
index 3d5e653b1..f2e22efa8 100644
--- a/tns-core-modules/ui/text-view/text-view.ios.ts
+++ b/tns-core-modules/ui/text-view/text-view.ios.ts
@@ -270,4 +270,4 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
     }
 }
 
-TextView.prototype.recycleNativeView = true;
\ No newline at end of file
+// TextView.prototype.recycleNativeView = true;
\ No newline at end of file
diff --git a/tns-core-modules/ui/time-picker/time-picker-common.ts b/tns-core-modules/ui/time-picker/time-picker-common.ts
index 428c27b75..aba5e0f4c 100644
--- a/tns-core-modules/ui/time-picker/time-picker-common.ts
+++ b/tns-core-modules/ui/time-picker/time-picker-common.ts
@@ -95,7 +95,7 @@ export abstract class TimePickerBase extends View implements TimePickerDefinitio
     public maxMinute: number;
 }
 
-TimePickerBase.prototype.recycleNativeView = true;
+// TimePickerBase.prototype.recycleNativeView = true;
 
 export var minHourProperty = new Property<TimePickerBase, number>({
     name: "minHour", defaultValue: 0, valueChanged: (picker, oldValue, newValue) => {
diff --git a/tns-core-modules/ui/time-picker/time-picker.android.ts b/tns-core-modules/ui/time-picker/time-picker.android.ts
index a6c92a6ea..dd9841da0 100644
--- a/tns-core-modules/ui/time-picker/time-picker.android.ts
+++ b/tns-core-modules/ui/time-picker/time-picker.android.ts
@@ -53,6 +53,7 @@ export class TimePicker extends TimePickerBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         const nativeView: any = this.nativeView;
         nativeView.listener.owner = this;
 
diff --git a/tns-core-modules/ui/web-view/web-view.android.ts b/tns-core-modules/ui/web-view/web-view.android.ts
index 92f7719af..2d51d2f49 100644
--- a/tns-core-modules/ui/web-view/web-view.android.ts
+++ b/tns-core-modules/ui/web-view/web-view.android.ts
@@ -101,6 +101,7 @@ export class WebView extends WebViewBase {
     }
 
     public initNativeView(): void {
+        super.initNativeView();
         (<any>this.nativeView).client.owner = this;
     }