Merge "Prevent restoring split selection state for fallback overview" into tm-qpr-dev