Merge "Fix sometimes deep link does not show in 2-pane" into sc-v2-dev