Merge "Prevent NPE when PowerStats Parcelable format changes" into main