Merge "Remove legacy lock icon in compose LS" into main