Seamless Movement of AirPods between iPhones and MacBooks

Hi Devs, So I'm not the only one facing this issue. When we use MacBook and iPhone at the same time, the AirPods don't revert back to MacBook automatically and are needed to be connected manually by clicking on popup. Is this issue going to be solved in upcoming updates?