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

* commit '5f09e62c80e6d50350cbc64c7500e7f6772a9848':
  Moving power control in default layout