Merge "Fixed a few battery issues in SystemUI" into nyc-dev