Merge "Handle additional users settings custom clock faces." into qt-dev