Merge "Hide media on AOD when not playing" into qt-dev am: 5c3320d720 am: 74601c0380
am: 45c32c93f6

Change-Id: I595b530bc18371ac76d34dc976e5f748ce49909f