Merge changes from topic "reland-b-423390143" into main

* changes:
  fix: Adjust to renamed isDarkTheme method.
  Revert "Revert "fix: Fix the battery icon using the wrong color ..."
  Revert "Revert "cleanup: Rename and clarify some status bar icon..."