Merge "Avoid duplicate text on keyguard indication" into rvc-dev