Merge "Dismiss dream when swipe up detected and keyguard unlocked" into main