Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev

src/com/android/settings/ChooseLockGeneric.java

@@ -648,9 +648,14 @@ public class ChooseLockGeneric extends SettingsActivity {
                                 mFingerprintManager.setActiveUser(UserHandle.myUserId());
                             }
                         });
-            }
+            } else {
+                // The removal callback will call finish, once all fingerprints are removed.
+                // We need to wait for that to occur, otherwise, the UI will still show that
+                // fingerprints exist even though they are (about to) be removed depending on
+                // the race condition.
                 finish();
             }
+        }
 
         @Override
         public void onDestroy() {