Bug 851684 - [B2G][Contacts][Settings]: Cannot update the contacts label, the update button is grayed out [r=jmcf]
Bug 815653 - [Settings] - remove :active for explanation items

Conflicts:
	apps/settings/style/lists.css
Bug 816067 - Change FTU backgrounds
Bug 823414 - B2G browser gradient value does not match the gradient found in Settings
[STK] On hideInput field we show the INPUT area as a password field
Bug 828908 - [Settings] Hints should not be treated as list items

Conflicts:
	apps/settings/index.html
Bug 830111 - [Settings] - arrange Phone lock screen
Bug 834446 - [Browser] Truncated Bookmark Label

Conflicts:
	apps/browser/style/browser.css
Bug 822585 - Change hand image
Bug 827804 - [Lockscreen UX] Entering passcode. "Emergency call" and "Cancel" buttons should be vertically centered
Bug 823793 - [B2G][Browser]: Long site names and addresses in the Top Sites/Bookmark/History tabs do not have their text truncated gracefully
Bug 829023 - [Settings] Don't use dividers to separate paragraphs in the same text block

Conflicts:
	apps/settings/index.html
Bug 835774 - [Building Blocks] [Filters] Left border should be removed
Bug 830380 - Replace third image of tutorial
Bug 828890 - [Settings] Scroll bar should not go over the header

Conflicts:
	apps/settings/index.html
no bug - lint error
Merge pull request #8794 from samjoch/cleanup-ux-branch

Cleanup ux branch
Bug 853799 - [Dialer] Fixing the Facebook synchronization (regression of 845487).
Merge pull request #8764 from gtorodelvalle/dialer-bug-845487-cross-origin-exploit-revolutions

Bug 853799 - [Dialer] Fixing the Facebook synchronization (regression of 845487) (r=jmcanterafonseca).
Bug 852537 - [Settings] Create performance test for the WiFi network list displayed in WiFi subpanel. r=rik