Merge "[Screen off unlock UDFPS] Settings integration 1/2" into main