Bug 930044 - Python UI tests Enhance wait in test_sms_with_attachments to wait for messages app to resize the attached image
Bug 918740 update the Activities system region locators to suit new menu/button style list r=bsilverberg/bebe

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/system/regions/activities.py
Merge pull request #13309 from bobsilverberg/cp918740

Bug 934145 - [v1.2] Update activities region and tests to be in line with master
Merge pull request #13326 from bobsilverberg/cp930044

Bug 930044 - Python UI tests Enhance wait in test_sms_with_attachments to wait for messages app to resize the attached image
Bug 921827 - Split media file list into types. r=zcampbell
Bug 921827 - Follow-up fix to use properties for the media type lists. r=bebe