Merge "Fix tiles animating when QS edit is open" into nyc-dev