Change screen locking shortcut
Setup a specific layout for the dev workspace
Update submodules to latest master