Merge "Workaround a robelectric related NPE in SurfaceSyncGroup.addTimer" into udc-dev