Merge "Fix toolbar scuba regressions" into pi-car-dev am: fdbbe640f6

Change-Id: Id6497dca32a3a20ac9a1aa46e05687eb7cb58aff