Merge "Fix guest tint" into oc-dev