Merge "Fix wrong-thread issue" into lmp-mr1-dev