Merge "Make Color non-final because apps break..." into oc-dev