Merge "Fix issue where surface was animated while wake and unlocking." into sc-v2-dev