Merge "Enable ChooserTarget ranking of the same app." into rvc-dev