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

* commit '6fd8884402659c1cf2fd6e638a36fa69396be4fa':
  Preserve window sizes when rebatching alarms