Merge "Fixing issue with transition jump due to wrong insets." into nyc-dev