Merge "Use drawable states for list positions instead of swapping drawables" into sc-dev