Merge "Fixed clock face resetting to default one after rebooting" into qt-dev