[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036 am: 16dadd0ae7 am: d2cd6284a2 -s ours
am: 5083f6e3cc -s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84 is in history

Change-Id: I9360f9a325d332d1d60d79d6bb8d4dcc410e4fdc