Merge "Tighten up Doze alarm timing." into sc-dev