Merge "Clear cached override frame when window removed" into tm-qpr-dev