after done timepicker
merge with minsumerge

CRITICAL BUG : additionalBtn onClickListener doesn't work