Merge "Revert^2 "Update test activities with a non-default icon."" into main