Merge "Revert "Revert "Removing insets controller animation as part of ..."" into sc-dev