Merge "Improved stack scroll range logic and more card background bug"