Merge "Fix condition to dispatch config for visible window" into tm-qpr-dev