Merge "[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036 -s ours am: f59ccec271 -s ours am: 8c0efea6b7 -s ours
am: 0075536e8e -s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84 is in history

Change-Id: I9362f6916462d3aef7908b4113c3ebba2a68c42f