Merge "Merge "Add visual feedback on UDFPS enrollment help." into sc-qpr1-dev am: 3ac7cfd3 am: c4f2e10d am: 5dd0219d"