Merge "[TNU09] Adjust restricted notification" into rvc-dev