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

Change-Id: I9f3332a8c27c867e948e15aff3a3e9ee6f11132b