Merge "Fixed an issue where clearing transient views could ANR" into nyc-dev