Merge "Update AllSetActivity animations for certain device types" into main