Merge "account for find dialog height when positioning layers"