Merge "Clean up App Standby code" into nyc-dev