Merge "Adjust caption observer for desktop transition" into tm-qpr-dev