Merge "Restore security context after sns_reg_init process interrupted" into rvc-qpr-dev