Bug 1047837 - Codify the concept of layout and layout page
Merge pull request #23936 from timdream/keyboard-page-target

Bug 1047837 - Codify the concept of layout v.s. layout page, r=rudyl, r=zac, f=mnjul
Merge pull request #23773 from steveck-chung/bug-983172-planB

Bug 983172 - Parsing jpeg header information for downsampling the image for thumbnail. r=azasypkin
Bug 1063406 - [RTL] USB Storage status (e.g. Enabled/Disabled) is not correctly placed in RTL
Bug 1064150 - Connect with WPS sometimes contains 3 lines
Bug 1061401 - Fix multiple activity window orientation issue
Bug 1051219 - Part I, Centralize the IMERender.setUpperCaseLock() call and skip if not rendered
Bug 1051219 - Part II, Centralize candidate rendering
Bug 1051219 - Part III, Move handleUpperCaseStateChange to renderingManager
Bug 1051219 - Part IV, Block IMERender calls if rendering is not updated yet
Bug 1062595 - No confirm window pops up to inform users that deleted numbers are removed from an ICE contact.
Bug 1055299: Ignore continuous app launch request in homescreen side and send homescreen to background while rocketbar is open in system side
Merge pull request #23254 from EragonJ/bug-1057917

Bug 1057917 - Remove the blue line in "range input" when selected
Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan

Conflicts:
	Makefile
Merge pull request #24035 from shamenchens/Bug1061401-MultipleActivityWindow-2

Bug 1061401 - Fix multiple activity window orientation issue, r=alive
Bug 1052256 - Block the click events before the first panel gets ready
Bug 1065519 - Ambient indicator based on list of notifications
Bug 1067251 - [Contacts] [Regression] Cannot reset phone field when editing a contact
Bug 1030564 - [Contacts][DSDS] SIM label flashing once when tapping on 'Add as favorite' and 'Remove as favorite'
Merge pull request #23964 from albertopq/1063305-nfc-statusbar

Bug 1063305 - NFC icon disappear after reboot r=alive