Merge "Whoops also need to move notification shade above lock screen."