Merge "Fix NPE in BootReceiver" into main