Merge "Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev am: 4ac6a113" into qt-qpr1-dev-plus-aosp