Merge "Fix bug 5297302 - Remember to release surface after starting drag"