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

Change-Id: I1d6598f7cbc30bdccab547194c3cde628fc7b320