Merge "Clean up dead code in NetInitiatedActivity" into rvc-qpr-dev