Merge "ONA: Track screen state in WifiNotificationController." into oc-dr1-dev