am 2e80aa73: am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev

* commit '2e80aa7302611b698897129c379907b18da89b91':
  Show the ResolverActivity in dock mode