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

Change-Id: Ia7a3759aa75e419b3c6cedd75d7b9fef2705b64c