Merge "Add support to configure state of operator name in status bar [2/2]" into main