Bug 1027231 - Making sure windows' height are integers in device pixels.
Bug 1029955 - [Dialer][Call Screen][Conference] Icon size is larger than others when 3rd call is answered
Merge pull request #21500 from etiennesegonzac/bug-1027231

Bug 1027231 - Making sure windows' height are integers in device pixels. r=alive
Merge pull request #21272 from pacorampas/1029955

Bug 1029954 - [Dialer][Call Screen][Conference] Icon size is larger than others and overlapped with 'Conference' when call hanging up r=rik
Merge branch 'master' of https://github.com/mnils/gaia

Conflicts:
	apps/system/test/unit/layout_manager_test.js
Software home button design update

Changes the software home button location in landscape
to minimize impact on screen size.