Merge change to take contentInset into account.