Merge "Promote the SEMI_STABLE_SORT flag from teamfood to droidfood" into tm-qpr-dev