Merge "Remove OTP calls on wake-up from PhoneWindowManager" into sc-dev