Merge "Add media icon to status bar" into rvc-dev am: 2d2b7250f6

Change-Id: I19867101149f902e345d627573cfbc1f68bff611