Merge "Fix collapsing toolbar does not stretch to top" into sc-dev am: 51119b00ce

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

Change-Id: I4f08c221d609b56886b3c24c1831fc87767c03ef