Merge "Add missing null check in HomeVisibilityListener"