Merge "Prevent activity leak when enableOrbColorAnimation is called on an unattached view" into mnc-ub-dev