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

Change-Id: Id34115415f5fdc85fdd9179ce028b2d634a286d0