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

Change-Id: Ia4a39a0750df4ef63b74bd2c837b30d7a449a591