Merge "QuickSettings: fix text alignment."