Merge "Revert^2 "Return to Launcher Home after wallpaper/grid apply"" into sc-dev