Merge "Drop Type clock face." into qt-dev