Merge "Modernize LightsOutNotifController" into main