Merge "Enable adjacent task animation for grid" into tm-qpr-dev