Merge "get rid of mirrorItemAt() which isn't used anywhere" into jb-mr1-dev