Merge "Fixed problem where scrim transition would be cancelled" into oc-mr1-dev
am: 43aca9cdc8

Change-Id: I3de9cb8713cd0df80aeffc21c29bcfc9a3818d92