Merge "Fix ListView not moving during catch" into sc-dev