Merge "Fix header padding when search not enabled." into tm-qpr-dev