Merge "getDefaultHomeActivity() could return null ComponentName." into rvc-dev am: 1e545046 am: ea4639f5 Change-Id: I421b1ee66890896e8337e153a9d34b6b853cabe8