Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev
am: 6e4de6ccdf

Change-Id: I1eb1c997c551461ff09efd1f3ea35276cbb4d43d