Merge "Fixes start new showWhenLocked activity will stuck on DreamActivity."