Merge "Fix issues with ListView.smoothScrollBy"