Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev