Merge "Fix jank in app pinning page" into sc-dev am: ebcb3308

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

Change-Id: I0c82fe96c17f235fd895c505f46ed0b360c1ac2c