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