Merge "Add Feature Flag support." into arc-apps