Merge "Stabilise BottomSheet tests by waiting for test to reach expected state" into sc-mainline-prod