Merge "GSF variations on Quick Settings" into main