Merge "Skip dumping surface control if it's already removed" into main

            for (int i = 0; i < size; i++) {

                final Map.Entry<SurfaceControl, Long> entry = entries.get(i);

                final SurfaceControl sc = entry.getKey();

                if (sc == null) {

                    // Just skip if the key has since been removed from the weak hash map

                    continue;

                }

                final long timeRegistered = entry.getValue();

                pw.print("  ");

                pw.print(sc.getName());