Merge "Revert^2 "Adding hasZeroInsetsIme check in case animationCallbacks are set"" into main