Merge "TextSelection.Builder.setId should take null as well" into pi-dev