Merge changes from topic "apr21" into rvc-dev

* changes:
  Fix regression in ringtone translations.
  Fix lock inversion bug.