Merge "Flag for enabling omni when bubbles are expanded" into main