Merge "Update spacing for lock icon with udfps" into sc-dev