Merge "Fix positioning error with draggable, revert and grid"