Merge commit '6b267ccec19a9ece5340281bf3035a366861990c' * commit '6b267ccec19a9ece5340281bf3035a366861990c': Account for find dialog height in content height
Merge commit '6b267ccec19a9ece5340281bf3035a366861990c' * commit '6b267ccec19a9ece5340281bf3035a366861990c': Account for find dialog height in content height