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

Change-Id: I1d41e4dee96af65e80646a0d5425b21982572876