Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev