Merge "Add elevation to BottomSheet of BottomActionBar" into ub-launcher3-master