am 2c326e62: DO NOT MERGE Refactor find and select dialogs

Merge commit '2c326e62316884a20822035c5470168d0e3b89ff' into gingerbread-plus-aosp

* commit '2c326e62316884a20822035c5470168d0e3b89ff':
  DO NOT MERGE Refactor find and select dialogs