am 947c03ee: Merge "Moving power control in default layout" into ics-factoryrom

* commit '947c03eee4856351b70fbf2a2d4a9dac37f27991':
  Moving power control in default layout