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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834628

Change-Id: I93214f3af090d7bd695174e851d69c604d899d05