Merge "Synchronize display change with the Shell" into tm-qpr-dev