Merge "Add flag for native session manager" into main