Merge "Fix NPE that occurs after battery reset" into main