Merge "Use overridden method for finding item position" into jb-ub-mail