Merge "Update radial time picker styling, clean up code"