Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev