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

* commit '1c565bfe53fe8205bf828f5073dd25d9d74a0f57':
  Preserve window sizes when rebatching alarms