Merge "Add extra animation params for media" into main