Merge "Update udfps view state before showing" into sc-dev