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

Change-Id: I671d4c10515bff0d5b79692707d2e71623e022d5