Merge "Check for header when restoring default clock." into qt-r1-dev