Merge "Update lock icon and udfps padding" into sc-dev