Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev