Merge "Don't try to drag non-model-backed views." into nyc-andromeda-dev