Merge change Id587a517 into eclair

* changes:
  b/2314560 Prevent PIN dialog from showing up on undocked docks