Merge "Fix getMediaUri() bug on secondary devices." into qt-dev am: 1db94b90d4 am: f0df748db6
am: 7429154144

Change-Id: I8eec406caa65d50848e6651e19241dc8e21da001