Merge "Stop dream when keyguard dismisses for trampoline activity launches" into main