Merge "Update error UI" into pi-car-dev am: 6e8a6bdfb2
am: fc218e2af0

Change-Id: I352ea1d47855d56bfed5990bfc2d4b56a2214c02