Bug 1020109 - Cell broadcast search list is not set correctly

The current code attempts to protect against empty objects incorrectly
since empty arrays are truthy in JavaScript. The result is empty objects
get passed to SettingsLock.set() which seems to break all subsequent
settings change observers.
Bug 1021578 - use "$(SEP)" instead of "/" for app-makefile-template
Bug 1021777 - Set multiple search engines by default
Bug 1022450 - Don't show the "WAP Push Message" string in the header when opening a message
Bug 1020744 - [Dialer][Flame] Enter more than 19 digits in dialer, back delete button moved couple pixels to the left
Bug 1022733 - Entry points lost their splash screen/overlay icons

The origin for applications that have different entry points (e.g.,
Dialer and Contacts are the same application, Communications) also
contains a pathname, so we need to remove that from the origin before
appending the splash icon path.
Bug 1023124 - [Flame][Keyboard] - Missing images
Bug 1020005: Send 'shrinking-stop' instead of 'shrinking-reject' event whenever 'techLost' event happens.
Also modified respective test case in nfc_manager_test.js. r=gweng
Bug 935636 - Avoid duplicating data on contact merge
Bug 1021270 - Focus the top active window while permission dialog hide
Bug 1023545 - [VsD Refresh] Lockscreen Visual Refresh > Time font is too small
Bug 1016897 - [Message]Previous saved draft will show up while entering edit new message view
Bug 1021270 Part2: Using loaded handler to focus
Bug 1023534 - [VsD Refresh] Lockscreen Visual Refresh > Pin code screen > Camera icon position

note: please land after bug 1023545 lands
Bug 1023448 - [VsD Refresh] Lockscreen Visual Refresh > Notifications background colour picker looks too light
Bug 1021213 - [B2G][NFC] The browser will remain in landscape mode after bumping with another NFC phone. r=alive
Bug 1020050 - [B2G] A check for gaia build size is needed r=testonly
Bug 1016283 - Prevent flash of black when switching layout of the same keyboard
Bug 973443 - [settings] refactor Display panel with AMD pattern
Bug 1018042 - [Settings] Pass available size as number to l10n.js