Merge "Protect from null Intent" into lmp-dev