Merge "Use killUid() instead of killApplication()." into rvc-dev