Merge "Add next alarm back to AoD"