Merge "Split-shade: prevent new shade expansion when shade already expanded" into tm-dev