Merge "Fixing customizer scroll in collapsed split shade" into sc-v2-dev