Merge "Stash dialog info when constructing pref dialogs" into mnc-ub-dev