Merge "Fingerprint enrolling should update UI while in multi-window mode"