Merge "Merge "App Standby Settings key is set incorrectly" into pie-cts-dev am: 8f74ba97f8"