Merge "Fix QS battery details not updating" into nyc-dev