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

Change-Id: I2dd8ce7f5f95bdebaacf91b7f6c9b9230acc3fc8