Merge "Remove 'on phone' from strings" into rvc-dev