am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting