am d93ecb3f: (-s ours) am 581f7861: DO NOT MERGE Refactor find and select dialogs

Merge commit 'd93ecb3fab669bb563fcb903966e854a593ceace'

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