Merge "Tweak master switch's right padding"