Merge "Fix SystemUI crashing during UDFPS enrollment touch"