Merge "delete of shared LocApiBase::mMsgTask may cause issues"