Merge "Ellipsize titles in middle, otherwise end." into klp-dev