Merge "Always show error messages on bouncer" into qt-dev
am: c8d2c71723

Change-Id: I66e87ff247c8458bdc9c733977d5388e122ada23