Merge "Merge \\"Check for detached view in drag-related APIs\\" into nyc-dev am: cdc9d7bed9 am: fead52ebf4" into nyc-mr1-dev-plus-aosp