Merge "Fix bug with clearing bubble to expand" into tm-qpr-dev