Merge "Ensure Compose-specific TEST_MAPPING is not removed on updates" into tm-qpr-dev