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

* commit '2d144063a696d249f6a2d75aed6ada544d22d13c':
  Fix flickering in alarm detail transition