Merge "Correct layout/draw/animation interleaving for insets callbacks"