Merge "Change NavBar to transparent black b/30615471" into ub-launcher3-calgary
am: 0472d496ea

Change-Id: If6ff28a43d6ed53395b1abef39d747415440f9e9