Merge "Update showing udfps keyguard affordance logic" into sc-dev