Merge "Stash dialog info when constructing pref dialogs" into mnc-ub-dev
am: 30cf890c76

* commit '30cf890c76fb8302c2e462b46e2ff9ca54950532':
  Stash dialog info when constructing pref dialogs