Merge "SF: Fix windowInfosReportedListener NPE"