Merge "Fixed crash with notification guts" into lmp-dev