Change-Id: Ifd35e85f6e2e18b4cdf77006138b60a6ede82e3e Conflicts: gui/theme/common/landscape.xml gui/theme/common/portrait.xml