Merge "Revert "Avoid resetting InCallAdapter when set."" into main