Merge "Allow 2-pane deep link to access unexported Activity"