Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev