Merge "Added new timepicker assets"