Merge "Quick settings bug fixes."