Merge "Update udfps layout on rotation when the udfps refactor is enabled" into main