Merge "Tweak string for Display over other apps" into rvc-dev