Merge "App Standby Settings key is set incorrectly" into pie-cts-dev