Merge "Fix preference dialog double-creation" into mnc-ub-dev
am: a038569b5d

* commit 'a038569b5d9023c612fe168ab274663487ce379f':
  Fix preference dialog double-creation