Merge "Wicked good battery saver + rotation icons!" into pi-dev
am: f354ba185a

Change-Id: I7936cfc374390bfde381759c6265b786d86e4248