Merge "Disable custom clock faces in SystemUI" into qt-dev