am eed6e7a2: am 2d144063: Merge "Fix flickering in alarm detail transition" into mnc-dev

* commit 'eed6e7a2874876a9b96ec8592367e1edaafd4b09':
  Fix flickering in alarm detail transition