Merge "Ensure scroll drawables are managed correctly"