Merge "Revert "Expose the HomeVisibilityListener API""