Merge "bring in classes to support conversation view's subject/labels"