Merge "Revert workaround for network limit dialog." into lmp-dev