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

Change-Id: I810bf53ff9c6b222fc01886b042c4d0f1661011b