I should also add that, by around 717, the Arab and Muslim identity of the Umayyad state was a lot more starkly defined that it had been before, leading to Umar II attempted reforms, and my notes about non-Arabs or non-Muslim Arabs at court do apply more to the Sufyanid period.