Merge "Merge "Clear cached override frame when window removed" into tm-qpr-dev am: f58e5c16 am: 55d205a7"