Merge "Make TimeController alarm skipping permanent."