Merge "Implement unlock hint." into lmp-preview-dev