Merge commit '90c0d0ab42ec909290abcc168ac0deded05a1141' * commit '90c0d0ab42ec909290abcc168ac0deded05a1141': In calcOurContentVisibleRect, account for the visible title bar.
Merge commit '90c0d0ab42ec909290abcc168ac0deded05a1141' * commit '90c0d0ab42ec909290abcc168ac0deded05a1141': In calcOurContentVisibleRect, account for the visible title bar.