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

Change-Id: Idea0d06f3b548f99c6504044a193db42368381c8