Merge "Fix NPE in FoldableDeviceStateProvider" into main