Previously the expand button could run into the header
And the content had no padding at the end.
Also, the content was incorrectly padded when collapsed.
Bug: 150905003
Test: add messagingLayout, observe UI
Change-Id: I3178b21dc8831f986a8249ee1e22aebffff75ef1