Bug 997601 - Save the caller id preferece across reboots
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
Bug 1024692: limit image decode size to 3mp on 256mb devices
pick picture size based on the correct config variable