Merge "Restore single-display check for visible recent task" into rvc-dev