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

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

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

Change-Id: I05c5d864ffed7b075ca66d532606e9f8ed484351