Merge "Hide media on AOD when not playing" into qt-dev