Merge "Update SBN overrideGroupKey onRankingUpdate"