Controls spacing

The last row may contain spacers, but these also need the correct
margins so all controls retain the same dimensions.

Fixes: 190089614
Test: manual (controls main activity + add/edit controls)
Change-Id: Ie19b98405213bc0f9ef53a11f44cb8013139e562