Merge "Don't use mock TaskViewTransitions in BubblesTest" into udc-qpr-dev