Merge "Revert "Band-aid for getHomeActivities returning null"" into sc-v2-dev