Merge "Fixed problem where scrim transition would be cancelled" into oc-mr1-dev