Merge "Added runtime flag for forced-app-standby"