Merge "Properly reset doze transition alarms with force-stop" into qt-dev