Merge "Add aconfig flag to guard contextual tips features." into main