Merge "modify quick settings to adopt the accessibility state api"