Merge "Fix touch fails after drag and drop" into rvc-dev am: 2c728339cd am: f146a53a0f am: 4477c325c4 am: 6b7b30519d

Change-Id: Ibb17fd68c522063018b5d79b39c02e8ecdb8eb9f