Merge "Increase the UDFPS touch area" into sc-dev