Merge "Use killUid instead of killApplication to kill app" into rvc-dev