Merge "Fix header clipping bug on rotate to landscape."