Merge "Move update popup header out of BubbleTextView" into ub-launcher3-dorval
am: 59c4ae4d89

Change-Id: I7d70478ccf17c74c65bab16641f888c105899799