Merge "Use WRAP_CONTENT for battery saver button" into pi-dev am: 1dbe185db2
am: 1f429286d2

Change-Id: Ia95728a05d7473c6898046141818700c8d52a97e