Merge "Prevent prefetch of attached views." into nyc-mr1-dev