Bug 1023812 - open bottom most window in activitydone
Merge pull request #17837 from shamenchens/Bug967089-Remove-Visibility-Monitor-ImgSrc2

Bug 967089 - [gallery] remove visibility monitor code if it is no longer..., r=punam(cherry picked from commit 006cab98e7844de9adeb93f6faa8d33205c8b8f3)
Bug 1018364 - Orientation locked while resuming device
Bug 997601 - Save the caller id preferece across reboots
Bug 1021583 - Update active app on app switching
Bug 1021027 - [Flame] Investigate failure in gallery tests
Merge pull request #20566 from bebef1987/gall-update

Bug 1021027 - [Flame] Investigate failure in gallery tests
Bug 1018035 - [Flame][v1.4][SMS]No cursor display when tap the message edit box.  r=azasypkin

(cherry picked from commit 534f9cf57b3fd85f7e408709a7f535e1b8ca3e81)

Conflicts:
	apps/sms/js/compose.js
	apps/sms/test/unit/compose_test.js
Merge pull request #20545 from crh0716/997601_v1.4

Bug 997601 - Save the caller id preferece across reboots
Merge pull request #20454 from julienw/1018035-v1.4-cursor-hidden-activity

Bug 1018035 - v1.4 cursor hidden activity
Revert "Bug 1003045 - hide 'Sharing using USB' toggle if the storage isn't"

This reverts commit cf0a961f62f36b38af86f8a27b7bfc642b86e3ac.
Merge pull request #20603 from comoyo/revert1003045

Revert "Bug 1003045 - hide 'Sharing using USB' toggle if the storage isn't"
Merge pull request #20574 from Rik/suggestion-slot-2-1022194

Bug 1022194 - Taping the suggestion bar with only one SIM in slot 2 does... r=drs
(cherry picked from commit cc25d10edb7f3485319a65d9d1c84852eef3774e)

Conflicts:
	apps/communications/dialer/js/suggestion_bar.js
	apps/communications/dialer/test/unit/suggestion_bar_test.js
Merge pull request #17360 from prcxuying/bug972308

Bug 972308 - Re-use the existing Audio object when playing keypad tones r=gsvelto
Bug 917630 - Allow unlimited keypresses when on a call
Merge pull request #20457 from davidflanagan/bug1015413

Bug 1015413: resolve large thumbnail flicker by uplifting bug 967089 to remove visibility monitor
Merge pull request #20622 from gittup/bug-917630-v1.4

Bug 917630 - Allow unlimited keypresses when on a call r=etienne
Merge pull request #19989 from comoyo/bug-1020109

Bug 1020109 - Cell broadcast search list is not set correctly. r=arthurcc
Merge pull request #20557 from alivedise/bugzilla/1021583_v1.4/resize-when-app-switch

Bugzilla/1021583 v1.4/resize when app switch, r=timdream
Bug 1023784 - [7715][calendar] create/modify/view event L10n