Merge "Merge "Drop Type clock face." into qt-dev am: fe6b8f696e am: 7771243d3c"