Merge "SF: Don't pop pending state into mCurrentState" into nyc-dev