Merge "Fixing wrong index passed when highlighting a preference during scroll" into ub-launcher3-master