Merge "Remove CloseGuard from DisplayEventReceiver" into sc-dev