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

Change-Id: I94ee905786992765f158e85f52ced4a0655bccad