Merge "Allow customizing Toolbar tabs" into pi-car-dev am: 4179a018ba am: 5148aad9a9 am: db525d173b
am: ecefc87456

Change-Id: I4de20e3fd7c62690a4406a7d40a3b55789072bc6