Merge "Fix jank when loading emergency info." into oc-dr1-dev am: ce2c089ef9 am: dca1380b08
am: c8b80ccd6b

Change-Id: Idd45eba84ea068916c311229677e63910ef15208