Merge "Decoupling InsetsAnimationControlImpl and the client"