am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb

* commit '661b6cfb2bcecdd335540db7059e5d8e22c2e79a':
  Okay, new plan for dialogs.