Really fix OFF Notification switch

Change-Id: I855e4f4d9d716663e32e7203ef625cdf0548711f