Merge "Fix textView id for NonExportedActivity" into rvc-dev