Merge "PopupContainerWithArrow accepting bubbletextview without icon being set." into ub-launcher3-dorval-polish
am: 293fba031e

Change-Id: I5b6dbf89188680b5407adb175cb3cef76b957dd3