Merge "SF: Don\'t pop pending state into mCurrentState" into nyc-dev
am: 9eb286a

* commit '9eb286a074a8b2764b69339b0958dc5b176f1a8d':
  SF: Don't pop pending state into mCurrentState

Change-Id: Ieb6b0f2a24a00b4c54b0a544b81fc72899305036