Merge "Adds hidden constant for FEATURE_CONTEXTUAL_SEARCH." into main