Merge "Fix tint on accessibility stream" into oc-dev