Merge "Update the surface position of each control in insets animation" into sc-dev