Merge "Fix NPE when dragging an app to bubble from taskbar" into main