Set padding on header, to avoid collision with collapse control

Change-Id: I75c37ded3cd9de80199e758483e184c15b620fb3
Merge "Set padding on header, to avoid collision with collapse control"