Merge "Update lock icon transitions" into sc-dev