Merge "Bug fix in Alarm where it was not getting called correctly if the new...

Merge "Bug fix in Alarm where it was not getting called correctly if the new timeout was set that was smaller than the previously set timeout" into ub-launcher3-calgary-polish