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

Change-Id: Ia01d8e9c902e10cbd837ec6c98c6c3b0fb2f9ed7