Merge "Fix bug: use content height instead of view height."