Merge "Add Setting for NR screen off indications" into rvc-dev