Merge branch 'rm-desktop-tweaks'