Merge "Content provider for quick affordances." into tm-qpr-dev