Merge pull request #16585 from asutherland/email-asflagfix

Bug 972514 - [B2G][Email] ActiveSync message state changes from server not synchronized error "Failed to parse a message: Error: Bad body type: undefined" thrown. r=mcav
Merge pull request #16626 from fcampo/fix-ftu-email-scroll

Bug 969230 - [FTE] Email address field is covered by keyboard in about B2G OS page (r=arcturus)
Conflicts:
	apps/communications/ftu/test/unit/sim_manager_test.js
	apps/communications/ftu/test/unit/tutorial_test.js
Bug 969230 - Fix lines inadvertently added when resolving a merge conflict during cherry-picking.
Bug 972666 - [Calendar] lines over events longer than 2 hours