Merge "Switch order of settings and power" into sc-dev