Merge "Merge "Use mock window manager for BubbleController in tests" into rvc-dev am: f7f3ba15 am: 55b0e4db"