Bug 1039961 - [B2G][OTA] The migration process is performed twice if the user enters in the tutorial
Merge pull request #21812 from empoalp/bug_1039199

Bug 1039199 - [Dialer] When you put the phone on your ear, tones are not...
r=etienne
Merge pull request #21839 from dmarcos/bug1024384

Bug 1024384 - [Flame] When changing default media storage from Internal ...
Conflicts:
	apps/camera/js/lib/storage.js