Merge "Take into account the visible title height when scrolling."