Merge "getDefaultHomeActivity() could return null ComponentName." into rvc-dev