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

Change-Id: Ib881859b11866118e6c54a9caaff561193d2dc97