Merge "Fix flickering in alarm detail transition" into mnc-dev