Merge "Tune SwitchBar padding"