Merge "Prevent exception when surrounding text retrieval" into rvc-dev