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

Change-Id: I60419fa88eaf52cb3ce30775881b5fa62c446ada