Merge "Avoid changing list view padding to zero"