Merge "Fix getDefaultDisplayHomeActivityForUser."