Merge "Remove old caption bar before adding a new one" into tm-qpr-dev