Merge "Integer to int causes null exception" into sc-dev

                    if (callbacks == null) return;

                    callbacks.broadcast(c -> {

                        try {

                            int targetDisplayId =

                            Integer targetDisplayId =

                                    callbackDisplayIds.get(c.asBinder());

                            if (targetDisplayId == null) return;

                            if (targetDisplayId == displayId) c.onColorsChanged(area, colors);

                        } catch (RemoteException e) {

                            e.printStackTrace();