Merge "For pre-N apps, keep entered all parents of an drag-entered child." into nyc-mr1-dev