Merge "Prevent monkey from triggering bugreport" into lmp-dev