Merge "Exposes affordance names through content provider." into tm-qpr-dev