Merge "Fix NullPointerException for requestNotification" into main