Merge "Add Quick Settings API"