Merge "Revert "Emulator: re-enable lockscreen by default"" into oc-emu-dev