Merge "Add feature flag for MBMS"