Merge "Add feature flag for Dynamic Android"