Merge "Moving power control in default layout" into ics-factoryrom