Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev