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

* commit '1870114cf6c25748ab66dace4e639c812f43d875':
  Stash dialog info when constructing pref dialogs