Merge "Remove unnecessary right padding from time picker"