Merge "Fixed default-cluster and empty-cluster navigation behavior"