3cdda0c3d7
Merge commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501' * commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501': Do not turn off screen immediately after undocking.