Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev