- fix the way we are passing switchBarMarginStart / switchBarMarginEnd Change-Id: Ic6e67643be10877a74ae68075460fa5fd4cc5da1