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

* commit '80bed748170b24f57d6a2db92b00c6be34e8f36a':
  Show the ResolverActivity in dock mode