Merge "Do not relayout when expanding shade" into sc-v2-dev