Merge "Revert "Automatically detect when Views move and apply velocity."" into main