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

* commit '6f75cb1476c1e59a255078468aa586b6fca32ee8':
  Show the ResolverActivity in dock mode