Merge "Preserve Composable state when expanding it" into tm-qpr-dev