Merge "Fix the endless panel loading" into rvc-qpr-dev am: a78af692c6

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

Change-Id: Iad7b84e6fe3a5c3d19048b5d0c9daf95c26465ec