Merge "Clearing mDestroying flag when app is made visible again" into nyc-dev