Merge "For non-udfps devices, use lock_icon padding specified in pixels." into main