Merge commit 'a0a8e1546a6f722cb886f3badac9de711d1b0e3b' * commit 'a0a8e1546a6f722cb886f3badac9de711d1b0e3b': Improvements to lock screen management: