Bug 1079700 - Fixing incorrect timestamp in performance test
Merge pull request #25496 from eliperelman/bug-1079700-v2.0

Bug 1079700 - Fixing incorrect timestamp in performance test
Bug 1079129 - [Woodduck] Lock screen is hidden by full screen prompt message
Bug 1073807 - [2.0 only] Improve smoothness of utility tray
Merge pull request #25146 from etiennesegonzac/bug-1073807-2.0

Bug 1073807 - [2.0 only] Improve smoothness of utility tray r=cwiis
Merge branch 'v2.0' into v2.0m.
Bug 1062312 - Add the 'critical' mozapptype attribute to the callscreen, not the dialer r=alive
Bug 1067802 - When the user cancels storing the message request authentication again r=jaoo
Bug 1074051 - [Settings] sound volume is not changed. Patch v2.0m
Bug 1050861 - Use version 2.4.1 for tornado in gaia unit tests
Merge pull request #25221 from kumarrishav/Bug-1082908

Bug 1082908 - Background color of contact list should be other than white so that it differ from empty space. r=felash
(cherry picked from commit 51ab1cfc1c4361c3761dd68b5c27644dcd9263a9)

Conflicts:
	apps/sms/index.html
	apps/sms/style/sms.css
Merge pull request #25609 from mancas/bug1074051_v2.0m

Bug 1074051 - [Settings] sound volume is not changed. Patch v2.0m
Bug 1072064 - The Data still displayed after you delete the call log from miss call Table.
Bug 1043712 - [Music] listen to touchend instead of click events
Merge pull request #25487 from mpizza/Bug_1072064_v2.0m

Bug 1072064 - The Data still displayed after you delete the call log from miss call Table. r=drs.
Merge pull request #25681 from mpizza/Bug_1043712_v2.0m_cherry-pick

Bug 1043712 - [Music] listen to touchend instead of click events
Bug 1092161 - Properly handle MMI short-string codes r=drs
Bug 1070481 - Update call log header count when dialer app becomes visible and in edit state
Merge pull request #25428 from shamenchens/Bug1070481-UpdateCallLogHeaderCount

Bug 1070481 - Update call log header count when dialer app becomes ..., r=drs
Bug 956902 - [B2G][First Time Experience] User is able to access and become stuck in Settings app during FTU/FTE