Merge "onFinished, update scrim based on lastState" into sc-dev