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

Change-Id: Ib2839704d0194bef59ff3663070429ed7c95e970