Merge "Use mAnimationType to decide if the insets of the first frame is visible" into main