Merge "Only show 2-pane deep link when homepage is available" into tm-dev