Merge "Add aconfig flags to guard contextual tips conditions checking." into main