Merge "[DO NOT MERGE] Only show lock icon background with UDFPS" into sc-v2-dev