Merge "Avoid resetting InCallAdapter when set." into main