Merge "Fix issue where surface was animated while wake and unlocking."