Bug 1068540 - [camera] Recording stopped by power key is saved, but not reflected in Camera/Video/Gallery apps
Merge pull request #24904 from justindarc/bug1068540-v2.0

Bug 1068540 - [camera] Recording stopped by power key is saved, but not reflected in Camera/Video/Gallery apps
Bug 1070865 - Fix incorrect resize within popup window
Bug 1073484 - [GAIA][Contacts]Edit two times in contact search result in improper contact data
Bug 1065731 - When adding a number to an existing contact, search icon does nothing

Conflicts:
	shared/pages/import/style/search.css
Bug 1082456 - The buttons of the fullscreen permission dialog become "Don't share / Share" abnormally after the geolocation permission dialog is shown previously
Bug 1072366 - [Lockscreen] Locking while the unlocking animation performs lead to black screen