Merge "Properly deprecate srprop=score|hasrelated"