Merge "Swap back content alphas for light and dark." into oc-dev