Merge "[Output Switcher] [Group by Type] Add MediaItem to store data" into tm-qpr-dev