Merge "Adding switch for Forced App Standby"