Merge "Disable ClockOptionsProvider so clocks don't appear in picker app" into qt-dev