Merge "Change layout of toggle buttons on safety QS, add preferences"