Bug 1034331 - Decrement fxa step count when going back from COPPA screen to enter email screen. r=ferjm

    Also: only increment the fxa step count if moving forward in the flow.
Bug 1035010 - [edge gestures] Unlocalized App name appear while switching App (without changing locale after reboot)
Bug 957031 - 100ms delay for keyboard key highlight
Merge pull request #21506 from 6a68/bug-1034331-fxa-coppa-progress-bar

Bug 1034331 - Decrement fxa step count when going back from COPPA screen...
Merge pull request #21456 from cctuan/1035010

Bug 1035010 - [edge gestures] Unlocalized App name appear while switching App (without changing locale after reboot)
Bug 1035928 - TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/app_usage_metrics_test.js | App Usage Metrics > Uninstalled apps are counted r=marshall_law
Merge pull request #21597 from KevinGrandon/bug_1035928_app_metrics_intermittent

Bug 1035928 - TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/app_usage_metrics_test.js | App Usage Metrics > Uninstalled apps are counted
Bug 1010415 - Disable intermittent notification_resend_test.js | mozChromeNotifications: Sending one notification, remove from tray, resend
Merge pull request #21519 from timdream/keyboard-hint-wait

Bug 957031 - 100ms delay for keyboard key highlight, r=rudyl
Bug 1029766 - Intermittent TEST-UNEXPECTED-FAIL | collection_test.js | Vertical - Collection drag icon (/w entry point) into collection r=amirn