Merge "Fix overlapping things in battery indicator" into nyc-dev