Merge "Move battery % down in QS, fix a lot of things"