Merge "Do not reset time if time was already set before" into qt-dev