Merge "Preventing installed PS apps from moving to home screen" into main