Merge "Fix broken trace views for accessibility/IM."