Merge "Added taskbar in/out animation when the bubble bar is expanded/collapsed" into main