Merge "Ignore the prefModeId only for PiP windows, rather than all non-focussed windows." into tm-qpr-dev