am 470d057a: am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

* commit '470d057aedee2f1a8b88a95419f8b1bb42f2120a':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting