Merge "Mark recent apps shortcuts as non-customizable" into main