Merge "Do not hide media metadata when bypassing LS" into qt-r1-dev am: 27c2dc5f55
am: 8d33e9b808

Change-Id: I162567276a73f4b52d9390d7ededa7e2c302b1ca