Merge "[CSAI] handle media view" into main