Bug 1019220 - Settings Icons need improvements
Bug 1016233 - [Collections App] Collection UI styling
Bug 1019139 - Make switch element inline-block.
Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info. r=fabrice

Conflicts:

	apps/system/test/unit/ftu_ping_test.js
Bug 1021237 - Make the edge zones higher in landscape mode.
Bug 1021533 - (bug 1018836 follow up) css class cleanup.
Bug 1018335 - removeFocus() when the screen is locked
Bug 1020628 - Don't allow user to start activity twice in keyboard settings
Bug 1015875 - OMA CP Settings not processed correctly, settings not active by default.
Bug 1021137 - added missing aria attributes the the lockscreen's passcode panel and media container. r=alive
Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales
Bug 1021708 - [Vertical Homescreen] Making search entry screen reader acesssible.
Bug 1007588 -[Cost Control] Implement an IAC mechanism to warn other applications about sending a SMS for requiring balance or making a SMS top-up
Bug 1003330: Mobile identity UI. r=ferjm
Bug 963394 - Visual refresh for event detail page
Bug 1014955 - [Camera] Migrate v1.3T downsampling patches to v1.4/master
Merge pull request #20143 from millermedeiros/1019617-week-view-am-pm

Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales r=gaye
Bug 1021279 - Add a couple more wallpapers to fill the awkward gap in the selection screen r=me
Merge pull request #19889 from eeejay/bug-1019139

Bug 1019139 - Make switch element inline-block. r=kgrandon
Merge pull request #19628 from gitmai/bug-1007588-CC-iac-with-sms

Bug 1007588 -[Cost Control] Implement an IAC mechanism to warn other app...
r=salva