Merge "Refactor App Standby code"