Merge "Show the ResolverActivity in dock mode" into mnc-dev