Merge "make the resolver activity's items visible"