Merge "Make ResolverActivity update dynamically." into ics-mr1