Merge "Make convo icon visible when transition from important"