(DRAFT) mw notif offset race condition

Change-Id: I7444bf55a11e817d85bb5c4879022633869fc55d
(cherry picked from commit 53b2e54dd6470db5c63500f6bb520d96fb028d60)