Merge "Update udfps fade + padding" into sc-dev