Merge "Aconfig flag to hide context menu items" into main