Merge "Moving test related to the app icon menu to their own file" into main