Merge "Revert "[CSAI] handle media view"" into main