Merge "Fixing flakiness of AppStandbyController test."