Merge "Fix issue #25817435: Batterystats missing UIDs for secondary users" into nyc-dev