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