Merge "Restoring last focused view when teleporting to a cluster."