Merge commit '6b2309f8dfeac86b825a688d48b20e12782fe135' * commit '6b2309f8dfeac86b825a688d48b20e12782fe135': Fixes and improvements to lock screen hiding, dock launching.