Comment # 23 on bug 92936 from Andy Furniss

While this bug is a bit messy being a multi bug, there are still issues = I can
still lock display as in 

https://bugs.freedesktop.org/show_bug.cgi?id=92936#c20

I will close this one and open one issue bug(s) when I get some time to re-test
everything.