Merge "Drop final remnants of Type clock face" into qt-dev