Merge "Fix that Keyguard didn't always get onActivityDrawn call" into lmp-dev