Merge "Update fp => lock icon transition to NOT be reversible" into main