Merge "Refactor some ViewHolder complications." into tm-dev