Merge "Send media view holder inflation to background" into main