Merge "Add automatic HDR transition animation" into main