Merge "Revert "Improve unlock motion."" into lmp-preview-dev