Bug 799832 - The scrollTop of a day/week view is always as same as the scrollTop in the previous view.
Merge pull request #9866 from evanxd/bug-799832

Bug 799832 - when swiping between days & weeks visible hour should be the same r=kgrandon,gaye
Bug 868218 - [MMS][User Story] Handle not-downloaded messages in thread view - r=julienw
Merge remote-tracking branch 'upstream/master' into pluralization-bug873703

Conflicts:
	apps/sms/test/unit/thread_ui_test.js