Merge "Use resolved configuration for shell transit clip rect" into tm-qpr-dev