Bug 965386: Readd no-transition class when coming back from camera panel
Merge pull request #15854 from qdot/965386-no-status-time-after-lock

Bug 965386 - Make unlock always fire when passcode correct
Bug 959049: reduce keyboard row height and font-size in landscape mode

fix the size of the word suggestion area, too

change so JS doesn't need to know anything about the definition of 1rem
Merge pull request #15702 from davidflanagan/bug959049

Bug 959049: reduce keyboard row height and font-size in landscape mode
Revert "Merge pull request #15702 from davidflanagan/bug959049"

This reverts commit cfeb5bf7e7665e4be412d1f774bd46fadeff3c93, reversing
changes made to a9a4e7bbcf55d1bd0a0d441f7dcc6271cc2dc6b1.
Merge pull request #15891 from davidflanagan/revert959049

Revert "Merge pull request #15702 from davidflanagan/bug959049"
Merge pull request #15702 from davidflanagan/bug959049

Bug 959049: reduce keyboard row height and font-size in landscape mode(cherry picked from commit cfeb5bf7e7665e4be412d1f774bd46fadeff3c93)

fix lint
Merge pull request #15892 from davidflanagan/bug959049v2

Merge pull request #15702 from davidflanagan/bug959049
Bug 956064 - Disable failing intermittent test
Merge pull request #15895 from KevinGrandon/bug_956064_disable_intermittent_today_item

Bug 956064 - Disable failint intermittent test
Revert "Merge pull request #15857 from comoyo/bug964216"

This reverts commit d8bdd6e84ccbb9027f811e42373cbdd53977980a, reversing
changes made to bcecb91f5ef7b0d9e426dbda489baee424eed93c.