Merge "Remove app icon prototypes code" into main