Merge "Restore focus history properly" into rvc-qpr-dev