Merge "Update time picker to match latest Material spec"