Merge "Add Setting for NR screen off indications"