Merge "Check the media.settings.xml property" into qt-dev
am: b9df2ec036

Change-Id: I0e2c4fb37e3a83a1eb2a5befc0c92be57f89ff53