Merge "Fix NPE in background thread" into lmp-mr1-dev