am d90e9e00: (-s ours) am 2c326e62: DO NOT MERGE Refactor find and select dialogs

Merge commit 'd90e9e004c74bd049339a3961b109d2055be1cb3'

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