merge branches: accept-empty-timepicker and set-view-value into master