Merge changes I12e6ca4c,If29d4fb0 into main

* changes:
  Enable batterystats for all display IDs
  Implement screen state batterystat events