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

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