Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1