Merge "Revert "Partially revert "modify quick settings to adopt the accessibility state api"""