Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/avfoundation/mediaplayer/mediaplayer.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro

Change-Id: I5742596230dc510ba2a09eba624429bb67179194