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