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