Merge "Fix intent for next alarm" into qt-dev