am 7eb83c59: Merge "Preserve window sizes when rebatching alarms" into klp-dev

* commit '7eb83c597fadaa41052c96826c7ca3e53aca9a3d':
  Preserve window sizes when rebatching alarms