Merge "Only watch location for BREAKPOINT event" into lmp-mr1-dev