Merge "Fix movement of RTC alarms with time changes" into qt-dev