Merge "Preserve window sizes when rebatching alarms" into klp-dev