am 581f7861: DO NOT MERGE Refactor find and select dialogs

Merge commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c' into gingerbread-plus-aosp

* commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c':
  DO NOT MERGE Refactor find and select dialogs